Ensure tests pass with optimizely switch.
Merge branch 'optimizely-logging'