Merge bd12635553fe839703212e1d3d919035d9590fa2 on remote branch

Change-Id: I008b5e75aaffa68ff95ce09314e30899426bf474