Merge 902d54ac019a9085244b645df717bdd77ecb4101 on remote branch

Change-Id: Ic48a44d256184ebdb84b3ea09633ccb03dec033e