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