Merge 25ecc5cef0cc2368576e47ce48e6175fcea4d443 on remote branch

Change-Id: Ie59dcf2772aacbd0e5adce3957623b42435fd03e