DO NOT MERGE Fix the remaining holes for access to APN data am: 30a633ac17 am: 364f9fada3
am: 2ee5b41fb7

Change-Id: I9c6942257f7ccce2aa523f83148531127eccdae8