Merge cherrypicks of ['partner-android-review.googlesource.com/3001620'] into sparse-12738848-L59400030008128884. SPARSE_CHANGE: I8163b0ebde9425ddb507685aa7fba308ae8d3d92 Change-Id: I5d2073c12de5f5eaf3be587052928b770c769622 Signed-off-by: Coastguard Worker <[email protected]>