Merge "Update Data Usage Settings for Enterprise" into lmp-dev