Merge ba5bdf0d81ebcaed561b4aebd0d2144140bd68e4 on remote branch

Change-Id: If7a1723b2a0f42ed0535d30b3266831946658f0a