am a78486ff: am ea9f79f0: am 94d4017b: am f618d720: Merge "Revert "Modify O2 APN details""

* commit 'a78486ff4f9b963824b641e0cba9cd0a6ff4da21':