Merge change Ia834022d

* changes:
  Convert DataConnection to an HSM and rename PdpConnection to GsmDataConnection.