tree c069fb05b4c27544bbc8bc4f1b009431c99ba613
parent 72700489d50a6e291cd55cd113c9d387538e6bc6
parent a346126adcc3105ee59083cd962a55ae43b083ad
author android-build-prod (mdb) <android-build-team-robot@google.com> 1621011693 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> 1621011693 +0000

Merge cherrypicks of [1708369, 1708706] into sparse-7343076-L53100000889266365

Change-Id: I7a911c3d5fb731cdc7c2fdd645c243baa99abbbb