Merge cherrypicks of ['partner-android-review.googlesource.com/3026019', 'partner-android-review.googlesource.com/3036203', 'partner-android-review.googlesource.com/3036187'] into sparse-12859539-L51200030008761432.
SPARSE_CHANGE: I85b46a781f4d2ec25fe3347c56ca166e540146d9
SPARSE_CHANGE: I4579bf38e1cae036905f5448bfdf56cfff0b030a
SPARSE_CHANGE: I3a4b340e53f6ec173475094f4d57f99be4208126


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