Also while we're there use 99 as the host index to make it slightly harder to confuse testing with production. Change-Id: I62193418feb9401fc06da39bd100553aef3dc52d