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

Change-Id: I6abe048410da981bd0adfe9919ad4e7ea734b0c6