Merge 77f27660da78f6ec143ea8163cf0b24b3f9d7b74 on remote branch

Change-Id: I02ed9978b3a3f9b75ca671320da118bbe85ad715