Merge 7f664a2f8392c966daa254b96270ba7ed748c2a5 on remote branch

Change-Id: Ic447ce40f44fdc28d5c45b7c4b102e9715a80c90