Sync with internal development trunk.

Bug: 175440069
Change-Id: I65efc88dbef27f2356dbf9cea96d232a05e6580d