Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
am: 7e959e42d8

Change-Id: I08d84382c1e9a6bc1a64dc9b4f3cb941873707d0