Merge "Fix APN build"
am: d3d5d5a962

Change-Id: I3e2d692aae51208f82b9bb90f69c4b32ed483f5f