Merge "Enable Omnient master flags in client code." into main