Merge 1f5dd1585a5c0c049c36df83f2fffefd3ebe2360 on remote branch

Change-Id: I0817142713b64725b1177b348cf23f2777e81c98