Merge change 7051 into donut

* changes:
  Use appropriate input types for edit fields in Apn settings.