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

Change-Id: I1e6a2330ee121d1439f0142982b4b11453cb841b