Merge 64e37e8416601aba8878ba240810c0109414191c on remote branch

Change-Id: Ie2441d2cf7877f52ad59476cce7929f120ff9aeb