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

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