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


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