DO NOT MERGE Revert "back to dogfood"

This reverts commit 87f5b7aa888b8fa42636a90346c1223dcc7bb023.
(cherry picked from commit 22f15acffa64771b22e1dd1da5d4885626e26b44)

Change-Id: I646b085c6075062accd9a95850d334f86bacc714
2 files changed