Merge "Otapreopt: Adapt for actual A/B" into nyc-dev
am: e72c378ef6

* commit 'e72c378ef6eac2b1638e759d97045c393e81bfcc':
  Otapreopt: Adapt for actual A/B