Merge 0166cdddc678ee157650e20f44859745966f80c8 on remote branch

Change-Id: I3ec497d089800dbc16fc00caa9d4035bf9c0accd