Merge "Renamed getNetworkId and getSystemId"