Merge "Change MeteredDataDisabled function names for clarity" into pi-dev