Merge cherrypicks of ['partner-android-review.googlesource.com/3002613'] into sparse-12738848-L59400030008128884.
SPARSE_CHANGE: I58bcc4458fda4d28727ee0a1bc598333b539f7f0


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