tree 42d23546d26704e1341c67f609edf09fff289cb8
parent 7b71ff547ace8007057db71b59fc3fc3ee435b87
parent 66eaff292dc1ef378f68d46b36842f0aac06c9c2
author android-build-team Robot <android-build-team-robot@google.com> 1570488406 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1570488406 +0000

Merge cherrypicks of [9514600, 9517315, 9517610, 9517666] into sparse-5908172-L30000000374561275

Change-Id: Ib452860b94258dd57b631af4c3b2846eaff8ef91