Merge "DO NOT MERGE Work around for not getting APN info in NetworkInfo object." into cw-e-dev