Merge d1e459e76fd143114cfb101094ed61db17b907f4 on remote branch

Change-Id: Ia5b2703aa0c394457e65359e147118e82ee21e07