Merge 952c0894ba7abf899d3f6ecac9e7f9a7779d5745 on remote branch

Change-Id: I44cccc53110371c89e5bc4274ab0fa6ed0edc587