Fix up for use by EDGE mode networking.
Fix up for use by EDGE mode networking.

Change-Id: Ie7578ee4957811a00485dd1681e58668b85ecc52

shaon/eutester,sjones4/eutester,nephomaniac/nephoria,tbeckham/eutester,sjones4/eutester,shaon/eutester,nagyistoce/eutester,tbeckham/eutester,shaon/eutester,nagyistoce/eutester,nagyistoce/eutester,tbeckham/eutester,nephomaniac/eutester,shaon/eutester,nephomaniac/eutester,nagyistoce/eutester,tbeckham/eutester,nephomaniac/nephoria,sjones4/eutester,sjones4/eutester,nephomaniac/eutester