Merge "Add more APNs for operators in France & Spain," into jb-mr1-dev