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

Change-Id: Id2127bc06790132ffb8ce21d2eaa19595a723231