Merge cherrypicks of ['partner-android-review.googlesource.com/3018607'] into sparse-12796948-L61900030008455193. SPARSE_CHANGE: Iffb2b7d83890cad6b2c8dfac4a45355a1284e8c0 Change-Id: Ia712bb078ecfb6d7c438c7312b79b6e579f07b04 Signed-off-by: Coastguard Worker <[email protected]>