Merge 261b72e83f0ac9165d7c38d9d9f83f49ebef924c on remote branch

Change-Id: Ic16276c5ae382df03bf0dde505fbbccf2579ebad