Merge changes I6eb4bf23,If020b83c
am: 81acc3f02a

Change-Id: I6c07fc4c45cd305e22e5df7bd46e48f7596d2243