Merge "Refine APN fetching logic" am: 765621670b
am: 74069bc022

Change-Id: I372d73a75a7dd2077e39dfc29c66b29b1a3ace65