Trying to get data usage working...

Change-Id: I5084e5e11369417436b30bf349fc43efefa1c1c3