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

Change-Id: Ie9bcdc9736c04ab787efc193311a20d03718b593
tree: d130fc3fc821e9daa4895ac7cd27b31d96c5b818
  1. core/
  2. services/
  3. tests/