Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev am: 936c0868f8
am: 7b913d70b9

Change-Id: Ifd131fb60996e416f44f7acc68257e4663ef4ba7