Merge changes Id16ea475,I38997710
am: 9da84f472f

Change-Id: Id5f599e6b6048cdb123359f91c0b610afbacc75b