Merge "Enable Omnient master flags in client code." into 24D1-dev