Set up overrides after infra setup

Change-Id: I6fa08c221aba70b9e1693586368e44234ed49a26
2 files changed