Merge cherrypicks of ['partner-android-review.googlesource.com/3004014'] into sparse-12757689-L80400030008278260.
SPARSE_CHANGE: I16e39dab63ae017ba50961a606896b17dfa4329f


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