Merge commit '04c12d3b4447c0f8ab8d6236f8e9afeeb6906098' into patch_branch

Change-Id: I61f1814737b928c2eca7668100b4b34ca2763a18