Merge "Cut the dependency to APN constants"
am: b3c04f00fc

Change-Id: I140f294e0b044c66b925ae5c8ae6f2859c694753
tree: 4c336ffba0056a3683e9501af8ad498a2f2d7c69
  1. core/
  2. services/
  3. tests/