Merge cherrypicks of ['partner-android-review.googlesource.com/3009288'] into sparse-12739144-L73100030008198611.
SPARSE_CHANGE: Idaf94d036ee26b4b7a39ddfc0743f4d770149d28


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