Merge "Update Golan (Israel) APN" into cm-10.2