Merge cherrypicks of ['partner-android-review.googlesource.com/3126019'] into sparse-13096118-L48600030010658438.
SPARSE_CHANGE: If8784d716249128d86bcb0d5dfb37c33f53726ee


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