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


Change-Id: Ie901c46e303aa2307f9823dec44427e89e5f9c88
Signed-off-by: Coastguard Worker <[email protected]>