Merge "Renamed getNetworkId and getSystemId"
am: d8b056a7e5

Change-Id: I42c9676bbefaa8e9540e9a23fb39815d05b71ef2