Merge cherrypicks of ['partner-android-review.googlesource.com/3016322'] into sparse-12820175-L22100030008640651.
SPARSE_CHANGE: I82e3fd6f9181b2578d9551b9ab78c28e5a513012


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