Merge 7761fcdbe8889092c1bbf900970d0ac6b5640a8d on remote branch

Change-Id: I7d11043cfdc32cbe0f1945ff494dfa6ff06fa7b7