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


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