Merge cherrypicks of ['partner-android-review.googlesource.com/3027810', 'partner-android-review.googlesource.com/3036370', 'partner-android-review.googlesource.com/3037071'] into sparse-12859539-L51200030008761432. SPARSE_CHANGE: I3c3ee7d1ac0f081ca47377d81f7066adf4765487 SPARSE_CHANGE: I5669b4c1e39cdb33cf01df60855067fa62984758 SPARSE_CHANGE: Iacd07484a9a9a00d7d4b5d91e2e0efc6bd918409 Change-Id: I0aadce4adaa0165989902497e4d7e5d6b30db805 Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>