Merge f75860449e7b3d674625987a6950fd687e9bc7d3 on remote branch

Change-Id: Ida010a9e0c6d1192c80e188aeebcc265e6c70739