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