Merge b07d0c5c331a764180e4c5035249cb669410c5ef on remote branch

Change-Id: If40e49d065972c705cada0f812cbe79f048d82e4