tree 1d0088bd9a38d52356c1c5f37f87736a7d4a4aba
parent 3cb7acada3c6fe21bf483ec77e1c8e91c3ae3009
parent 80b5d35d2a7acd4221ebe751249b10863b784773
author android-build-team Robot <android-build-team-robot@google.com> 1569803228 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1569803228 +0000

Merge cherrypicks of [9472539, 9472616, 9472853, 9472854] into sparse-5891648-L80400000371536426

Change-Id: Ie2bf91aea3f0a1da2558d675f6982fea2ddf6ca4