Merge b906d6365f33bf28230faa7b07c11ff8f6b08ae8 on remote branch

Change-Id: I4c488e178e71d5eef3112f29ed19744610543124