Merge "Remove dependency on apn network attributes"