Merge 06b1d504422d720badd6a0d2d1f6718e705cbbdf on remote branch

Change-Id: Id8d6eb4b140c2c5e5b5607d20ad4837b8a529ed4