Merge "Cut the dependency to APN constants"
am: 8f0513bd0b

Change-Id: I140f294e0b044c66b925ae5c8ae6f2859c694753