Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev am: f78b8ce258
am: 563a57bcf9

Change-Id: I9b5b2fc72188258326cc875457886370cb20e4fd