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

* commit 'c47bd59a466afa8a78a4b07beae38901e447bd8b':