HP1 region deploy config fixups.

Change-Id: If550305152b1b5eb5c8dbd319fd3791b11d03ef6
Merge "HP1 region deploy config fixups."