am 5b4ba9b9: am 63c12871: am 8c8fff44: am 0a91b05f: Merge "Don\'t use deprecated getNetworkInfo(networkType)" into mnc-dev

* commit '5b4ba9b9107e869c6bf5cf733370ff31e21ffacb':
  Don't use deprecated getNetworkInfo(networkType)