Merge commit '5017a3d63079abf686c900e4854f533bad8903c1' into patch_branch

Change-Id: I73786d5fde64b2d62a998ea486c85d2d298dbeb6