Merge commit '0aa8c1e984c3b907909be159735c0c5c3728efce' into patch_branch

Change-Id: I2ed9edaad678b5ef8c189ff7e95c1308465aff57