Merge 4a32fa2b7085aef7cbd54bbf97bc9b125300ecd9 on remote branch

Change-Id: I1241d0aed91a3aff59d0bcef4e1c5bb510011970