Apn settings fixes / code maintainence (2/2)

Change-Id: I2bdfc346815115bb19ba469a61ccca9ae4e036dd
Merge "Apn settings fixes / code maintainence (2/2)" into kk4.4