This is in preparation for the east infra-cloud rollout. Change-Id: Ie083aa5866ba60c177f95b374bee781018946be8