Merge cherrypicks of ['partner-android-review.googlesource.com/3001620', 'partner-android-review.googlesource.com/3029458', 'partner-android-review.googlesource.com/3025034', 'partner-android-review.googlesource.com/3036777', 'partner-android-review.googlesource.com/3047813'] into sparse-12653312-L40200030010309035.
SPARSE_CHANGE: I8163b0ebde9425ddb507685aa7fba308ae8d3d92
SPARSE_CHANGE: Ib28b4628840619755da50088f8d13b713b16e400
SPARSE_CHANGE: I640ed77ebc92fd73027dd1e7410446f991b3bcc6
SPARSE_CHANGE: Iefda621d6015e50fdca2cd0e82da3a4cb46899d9
SPARSE_CHANGE: I5113ee56b1d784886fbb00a8770a57a3d5a51919


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