Merge d7d8b0dac50c56168367b2566b3f17805c1be5c1 on remote branch

Change-Id: Ib1b3d61fa645bd5b11c5abff4aa7527b652fe14d