Merge 5f571a2b39b6117a63c0769dd20ee2f8f5233cd4 on remote branch

Change-Id: Ic288a6ff64ba416fee96ecd04d48a5d6bd13bae6