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

Change-Id: Ic2c72f16df71049ca686e7fb367cfd58eaaefd4e