Merge cherrypicks of ['partner-android-review.googlesource.com/2989356', 'partner-android-review.googlesource.com/2989775', 'partner-android-review.googlesource.com/2994806'] into sparse-12653312-L23900030008443640.
SPARSE_CHANGE: I85aa69780e04c3d171cad74ef909ef12e3a67b3b
SPARSE_CHANGE: I088217ecf9fb30813b8f338fdfad315181ba9e4e
SPARSE_CHANGE: I60450c0e0c91f34a743680d9474378c02dabad99


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