Merge "Cut the dependency to APN constants" am: 8f0513bd0b am: 28df771bd4
am: 72cd1fa27a

Change-Id: I71f8a944fcb8b3d8199296aef67251b50abe6172