Merge "Renamed getNetworkId and getSystemId" into pi-dev am: 6b4e6a17e9
am: a4bc10ab2c

Change-Id: I3464d53c8cd9cf3c90cb9bf49489d9cb93e7dc96