Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev