tree 1ef00eb8b38e2b39f2ecad37c60e8011d5bf2141
parent c138160bee4fe81a66af3e5770d3d9a7f4ebff59
parent acf8b5022a533828b0874ca8025b72eb8f4e0b22
author android-build-team Robot <android-build-team-robot@google.com> 1570488403 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1570488403 +0000

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

Change-Id: If68a7a6cd997e7257a8e543023140294709bffe8