Merge changes I16e45b38,I150ade94
am: f887894039

Change-Id: If5186f053a4380b657352658311c17234ac7ac16