am 87364948: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '873649482d1c292ebcbf0d2ac526553a01064ec4':
  DO NOT MERGE Adding Softbank APN for SIM unlocked device for jb-mr1.1-dev