Merge cherrypicks of ['partner-android-review.googlesource.com/3026195', 'partner-android-review.googlesource.com/3036394'] into sparse-12653312-L40200030010309035. SPARSE_CHANGE: I0b08d56a19b7e10c297fce877e332eb33218fd49 SPARSE_CHANGE: I78a22ccf12ab23b51a641b650b1bc0faf614c47d Change-Id: I5c65c1f0b544b3c34ba7788f6b913ae890be7170 Signed-off-by: Coastguard Worker <[email protected]>