Merge 170a8b5c1ed69367705a171afa4f930a3e81c301 on remote branch

Change-Id: Ia2e42bd1c804d4c83beeb5faa0fb55235af222eb