Secondary migration from google3 into AOSP.
am: b596388f44

Change-Id: Ia6574ddbceccbf96df595ced4feec6ce5da63aa8