Merge cherrypicks of ['partner-android-review.googlesource.com/2997648', 'partner-android-review.googlesource.com/2985241', 'partner-android-review.googlesource.com/3021791'] into sparse-12820175-L22100030008640651.
SPARSE_CHANGE: I825398b2b569868708698ccfc41bd1b54d961280
SPARSE_CHANGE: Id5bb881cf4f92e9664df8121bab87c469f2c4fa8
SPARSE_CHANGE: Ia8506b3672d7589e777b48cd153206af4d0fd1e2


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