Merge commit '8d4d2a5914b2ce5aff56feae463101d548604fc7' into patch_branch

Change-Id: I71a48c7ee01457586f611b6d9bd048571826b982