am 6022d464: am 2777fe95: Merge "Modify O2 APN details"

* commit '6022d46491adf47513053cd8a58240e731481d44':