data usage fix

additional changes to make "data usage" work 
Change-Id: Ib64dd87b317ef0b852a4d3f987dbe0a541ac56b8