Merge commit '0e1047110f8b12017c07fc5d259221d3d71f63c2' into patch_branch

Change-Id: I45168b52587898abbcdde1f6415e28722ef21618