Merge "Fixed a bug where APN did not always show." into lmp-mr1-dev
automerge: 66e70a4

* commit '66e70a4c9e022701cdf8293b2959b1e1d18df9d7':
  Fixed a bug where APN did not always show.