Merge 8d46a3c691776bcda7ad0e55c481b41d41235e33 on remote branch

Change-Id: I79d7b3d899f1882dcf39c03632438b37e67d6140