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


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