Merge "Updates to data usage prefs" into qt-dev
am: 8bd90f58bf

Change-Id: I1e50944c0dd9e6b67f2d9435268ac98c89d2f0e5