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

Change-Id: I2b3f2d92b132356cd0840914c36ea29500d2d64a