Merge 0fe64d33be3f853c0ed6fff43be4ee97b887b8c4 on remote branch

Change-Id: Ic22092e1ec885b4f5446b003cad58d1d3c2ef1c6