Merge "APN/FIX: typo in german O2 apn" into jellybean