[automerger skipped] DO NOT MERGE Fix the remaining holes for access to APN data am: 06c21538c2 -s ours am: 728e3d352c -s ours
am: 364946adcd -s ours
am skip reason: subject contains skip directive

Change-Id: Ib88a095cb7369991f372e523eb9951059bc73d33