tree 5c5809303115aaa64e9380be8eec24434cd3a5cd
parent 4d740d67dad1ff785e7408ba65469948b6cf678e
parent 24aea2b9b9c12400919203843c92ef808c7ad560
author Sasha Smundak <asmundak@google.com> 1593729915 -0700
committer Sasha Smundak <asmundak@google.com> 1593730124 -0700

Merge upstream master, add mandatory files

Bug: 158031244
Test: N/A
Change-Id: I4f869f80b5e04919ddc8def96f0e4ea91c45c8cb