Merge cherrypicks of ['partner-android-review.googlesource.com/3037772'] into sparse-12883629-L33200030008809322. SPARSE_CHANGE: I81b02e1107a02840ecf6eae56c0bbe7fdfe880fa Change-Id: I693dd0c42989c5958b5dddabebbcafe94f4949b9 Signed-off-by: Coastguard Worker <[email protected]>