Merge cherrypicks of ['partner-android-review.googlesource.com/3020610'] into sparse-12859539-L51200030008761432.
SPARSE_CHANGE: Ia5b9c137e4ac8266d7c430d35a6978d3aa50eb5e


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