Merge b91bd7aaf2ce621d1f725d920fdf1645ce85f51a on remote branch

Change-Id: If52ac35ad443c2097b05db34230d2b8c472368e8