Merge e6a7f2cd263e16647a71d296f015bb80894e5579 on remote branch

Change-Id: Ied4b79f6a9140b2edf040efb935e9a44997eea08