Merge b1fd86b7d106b18e9223893454341c69070d10ec on remote branch

Change-Id: Iffe7d2c5a0317253cad722ed9c15550ad5953c83