Merge 0ac132df00ece6f83618d82c383b5948c161e083 on remote branch

Change-Id: I1472c8394c66cea1b2699da17fc7054843e85676