Merge cherrypicks of ['partner-android-review.googlesource.com/3027457'] into sparse-12859539-L51200030008761432. SPARSE_CHANGE: I1df06c5c3e6263ec2b85ff608c9f0779affa7924 Change-Id: Ida4cff47018b17e9599ebefd5b0ee1344960ded1 Signed-off-by: Coastguard Worker <[email protected]>