Merge cherrypicks of ['partner-android-review.googlesource.com/3048407'] into sparse-12896835-L49000030008918233.
SPARSE_CHANGE: I749960e19ac4883198640ee05c22aab9b8dc2cc1


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