GitLab

Bug: 31182185
Bug: 31240674
Test: m dist in an unbundled branch
(cherry picked from commit b6c061e9)
Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af