Merge cherrypicks of ['partner-android-review.googlesource.com/2990659'] into sparse-12653312-L40200030010309035. SPARSE_CHANGE: I2a59e4edb14eea6a1bfb4d99ff1dffbbce9838c9 Change-Id: I43db3d5113467319210f51f90de11b16f970a11f Signed-off-by: Coastguard Worker <[email protected]>