Merge d2b321dace69bf1dc775eb49edf20dd00ef04603 on remote branch

Change-Id: Ia2845e54dcdab81689486434f0508dec6af3de2a