Merge cherrypicks of ['partner-android-review.googlesource.com/2937001'] into sparse-12362889-L89400030006799064.
SPARSE_CHANGE: I587282ede5602588f14c4b554686ca15f1c63bd3


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