Merge commit '229eff8311d153965bf8c2ab65a189a87dbe59bd' into patch_branch

Change-Id: I1a37399aace6c5b1a346a6a549632899a88bd161