DO NOT MERGE Fix the remaining holes for access to APN data am: 30a633ac17
am: ef2ec4e58c

Change-Id: I8a03a183e85f781331014bca400dc720bd7bb67c