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

Change-Id: I2cc76316bca81c12e56337d6e36d82b0de6d9ded