Merge "Renamed getNetworkId and getSystemId" into pi-dev