Merge "Fix Vip mobile APN" into cm-10.1