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

Change-Id: I97f01b82916e66673339bef437d80927e78282ee