tree 88c23fec38d02f35d8b7ca65d92bea1bde4342f6
parent 8e0c24c026c467e39571d453877c78480d4f0d82
author Alex Van Damme <atv@google.com> 1599778668 -0700
committer Alex Van Damme <atv@google.com> 1599778668 -0700

Sync with Enterprise version

- Sync to commit fcebdc17f3b7f9ea99e9430c951ac74044910114 "Fix broken use
with --oneshot"

Change-Id: I65450ecfc40d11fc3117303e66938751208a6b8d