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


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