Merge 716589dbbfb1ad8c50517e458a9004e504340769 on remote branch

Change-Id: Ieb08848fe5cc9d875cb7e7932e003502d07dd318