Merge 2d77fae68946b4159cfdba75426d84ef0c317e9f on remote branch

Change-Id: I6273a3b280e13c821487d2f4527d018383ec53bf