Merge 85a5f41ed3ea90623b5eac4519af6550a1b97027 on remote branch

Change-Id: I610e1b8849af1e8b1d59aecce5ea48d24cf77688