Merge "Fix APN build" am: d3d5d5a962
am: 53122f12b4

Change-Id: I841c37a026ee1a9e377ed77702b32b365e6a9a8a