Merge commit '99b80b54a21f9368a825d110f9d6db8e41903319' into patch_branch

Change-Id: I823673fc06d816bb92b34f39efbe2896b1f1bcab