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

Change-Id: I3eed2f200bf8b9a0aa6b3481182c67882810c232