Merge 1fd52d423fdddda61bdf8b8550c54f2ea7b12ff6 on remote branch

Change-Id: Iba7408462561b49cc2ec78c78db772a445cb7782