am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

* commit '7e411f74efe6dd383e59634760cccd96da1c209b':
  Add support for NETWORK_TYPE_GSM