Merge cherrypicks of ['partner-android-review.googlesource.com/3003170'] into sparse-12728269-L19100030008170911. SPARSE_CHANGE: I588dd3474b8a18e27771012fae863eba8862f7c6 Change-Id: I0a3feab76d4ea9de82ec2422ec1cff617113fa58 Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>