Merge "Zen: make Condition available over @SystemApi" into lmp-dev