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

Change-Id: I8ece579845bc2959bd213bfd93f8b6d4bd0c5728