Merge cherrypicks of ['partner-android-review.googlesource.com/3002613', 'partner-android-review.googlesource.com/3004469', 'partner-android-review.googlesource.com/3004425', 'partner-android-review.googlesource.com/3026019', 'partner-android-review.googlesource.com/3036203', 'partner-android-review.googlesource.com/3036187'] into sparse-12653312-L40200030010309035.
SPARSE_CHANGE: I58bcc4458fda4d28727ee0a1bc598333b539f7f0
SPARSE_CHANGE: Ifb1379809faee8e3e6004e8616e6a7c967370603
SPARSE_CHANGE: Id410cd52b42aed8c5418b839834a0ff122a042e6
SPARSE_CHANGE: I85b46a781f4d2ec25fe3347c56ca166e540146d9
SPARSE_CHANGE: I4579bf38e1cae036905f5448bfdf56cfff0b030a
SPARSE_CHANGE: I3a4b340e53f6ec173475094f4d57f99be4208126


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