Merge "Make getDataEnabled take more into account."