Merge "Sync to internal master"
am: 6f2b0c6d0b

Change-Id: I5368e0a68e271dac158c9ff4cb8eba10c5b1c902