Sync with Enterprise version - Sync to commit fcebdc17f3b7f9ea99e9430c951ac74044910114 "Fix broken use with --oneshot" Change-Id: I65450ecfc40d11fc3117303e66938751208a6b8d