Merge cherrypicks of ['partner-android-review.googlesource.com/3048758'] into sparse-12896835-L49000030008918233.
SPARSE_CHANGE: Ic3565d9e376fdcab2ca80b1eb2488567e79f5d8b


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