Merge 625aecf21bd93f98c9f9b5d1e863b2f71f936785 on remote branch

Change-Id: I830662ffb17d792da07cdc1859e223f9ab1b6b30