Merge cf07538c60c4262e84264cc1eb85fe1c56267a62 on remote branch

Change-Id: I0ca9544f99a3d601107430c83e90c28ab16dcd8d