Merge cherrypicks of ['partner-android-review.googlesource.com/2900931'] into sparse-12186944-L11600030005829703. SPARSE_CHANGE: I1a25ab5a152b40242fae2923b012afe1299e0311 Change-Id: I49fd2f4a4bd2a6a58ea3ad2272c8d18f93133449 Signed-off-by: Coastguard Worker <[email protected]>