Merge "Added APN to string method" am: 3bedd0a674
am: 56ce3a6f41

Change-Id: I61247c8f7e8f5069b28167b9e940782f80edfaee