Merge "Renamed getNetworkId and getSystemId" am: d8b056a7e5
am: c88f1f78c5  -s ours

Change-Id: Iebca3a36675f26ea37396ee7e3abd069eca01d45