Fix up for use by EDGE mode networking.

Change-Id: Ie7578ee4957811a00485dd1681e58668b85ecc52