Merge 2b2e77bbdbd96b8931acd1284d7e9c62bb024493 on remote branch

Change-Id: I5d9e5390cc151fcb194025b38de0dc09715c7325