Merge cherrypicks of ['partner-android-review.googlesource.com/3026196'] into sparse-12653312-L40200030010309035.
SPARSE_CHANGE: I7b2eb2f1785ce99abc210e8e34e26787e453f9d3


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