Merge "Fix APN build"