Merge cherrypicks of ['partner-android-review.googlesource.com/3002613', 'partner-android-review.googlesource.com/3004469', 'partner-android-review.googlesource.com/3004425'] into sparse-12653312-L23900030008443640.
SPARSE_CHANGE: I58bcc4458fda4d28727ee0a1bc598333b539f7f0
SPARSE_CHANGE: Ifb1379809faee8e3e6004e8616e6a7c967370603
SPARSE_CHANGE: Id410cd52b42aed8c5418b839834a0ff122a042e6


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