am f68ac357: (-s ours) Revert "DO NOT MERGE: Revert "back to dogfood""

* commit 'f68ac357cf0fbdcef67edae760c1debba4f8f75c':
  Revert "DO NOT MERGE: Revert "back to dogfood""