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

Change-Id: I68029ca53a6f0cd66992e1d4f70cd39e74218b8b