Merge 673eb537328d68665273aeff408910d05121d5ef on remote branch

Change-Id: Id293039ff0b1b2f055cc481bd0afe126436f5b06