Merge 4069f87ab1c2ce4fb86a5ccde992e67031402a07 on remote branch

Change-Id: I7a5e2fb4e12a06992d48c265fc6546b01a731ca9