Merge change 5669 into donut

* changes:
  Fix setting of the APN type.