Merge cherrypicks of ['partner-android-review.googlesource.com/2984985', 'partner-android-review.googlesource.com/2984984', 'partner-android-review.googlesource.com/2990375', 'partner-android-review.googlesource.com/3027779'] into sparse-12653312-L40200030010309035. SPARSE_CHANGE: I43bde78d78bcc31767957749236144854c128e6a SPARSE_CHANGE: I755a5ad33d3d503ae2f851dde3d297d9c1ff1a14 SPARSE_CHANGE: I243857800213b72c2a572664bc3a4e5ab41fe97c SPARSE_CHANGE: Ib413055fabe826aabc7ea6aa3bd8e373e901e6ba Change-Id: I1bd3d079a861292b18b5d22dfc3b4b9c4fb4c794 Signed-off-by: Coastguard Worker <[email protected]>