Merge cherrypicks of ['partner-android-review.googlesource.com/2996755', 'partner-android-review.googlesource.com/3020610'] into sparse-12653312-L40200030010309035.
SPARSE_CHANGE: Ic4a10c411588d3caf3494ca3e33157208a11e7fb
SPARSE_CHANGE: Ia5b9c137e4ac8266d7c430d35a6978d3aa50eb5e


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