Merge 0e40f765180654de058c24249c3ddd9fcb284b02 on remote branch

Change-Id: Ia7b0755f28a9f62dd0c6358ac26afbc552f97493