Merge 40067f78cb0f60c0764d09a89a972d63fe6be7d0 on remote branch

Change-Id: Ifd83ef2ddace75ffbec871fef2ce9100573ba76d