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

Change-Id: Ie79a4cdd030c6adea280aa55de4690ebff58dfc8