Fix Etisalat UAE APNs

Change-Id: Idf0281b4d68a6efefca1d61812d42b3dcfc086ce
Merge "Fix Etisalat UAE APNs" into cm-11.0
Fix some translator names

Change-Id: I29272faaa9d8f62da986423477ba8c6d8bd06e5a
Merge branch 'cm-11.0' into kk_mkt