Fix apns
Merge branch 'jb-mr1' of github.com:STS-Dev-Team/android_vendor_motorola_common into jb-mr1