Merge cherrypicks of ['partner-android-review.googlesource.com/3124659'] into sparse-13052278-L15100030010642314. SPARSE_CHANGE: Ibe8b45e7bef474db120be110293664e6ead8a24c Change-Id: I4a79a5d624f8b9acf097c6ae8414440f11107f37 Signed-off-by: Coastguard Worker <[email protected]>