Merge "Change MeteredDataDisabled function names for clarity" into pi-dev
am: 631f55ba54

Change-Id: Icf55fa2d58a0d36c21e331f1756e3f05b3cc61f0