APN fixes [1/2]

Change-Id: I77b5e637d1dc20c4119669c9af7b87e0e317ee32