Revert "Revert "Merge to upstream r304942."" am: c79549b70e
am: a6ad534de1

Change-Id: I9bbf33a3878944de3a231e347a3c4682092f39e9