Merge "APN changes requested by EE"
am: 58308e1a30

Change-Id: I2d5765414cdfbbe9eebd95e57e71c5a82f6df05c