Merge "Fix APNs for Cyprus" am: 6e0aa95952
am: bb04473907

Change-Id: I098bf321058dc22788f976f93f08737cbbc6b1f5