Merge 52ad22d48b2e827fc2484d9db3905472e7e292a7 on remote branch

Change-Id: Ife83b02537da65a0dc68e379e40cff8af35b227d