Merge 4d659d25ef72ab61f3808723e889dd0c7e80be55 on remote branch

Change-Id: Icbb2aa4a7637232db91bb473427e6573e333b0fc