Merge cherrypicks of ['partner-android-review.googlesource.com/2991899'] into sparse-12653312-L23900030008443640.
SPARSE_CHANGE: Iee0dafec1a7e6286419056742075a6375e75cca0


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