Merge "APN changes requested by EE"