Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev am: e0fe6df357
am: 0cd9173ad3

Change-Id: I82d0ba458b4caf71bd7bf6719b027bd89767709d