Merge cherrypicks of ['partner-android-review.googlesource.com/3002951', 'partner-android-review.googlesource.com/3026451', 'partner-android-review.googlesource.com/3037085'] into sparse-12653312-L40200030010309035.
SPARSE_CHANGE: I9e91f95cfef22241ba927279a9e78c4fc7a3deed
SPARSE_CHANGE: I80217ca47f468ad8df808f7295437eab46d5d340
SPARSE_CHANGE: I2b8459696ba2070d8d10f71c5c6f4f06075ac6d3


Change-Id: I51fe62474bec33c8e3f5b3660c7057f5d66cacb7
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>