Merge "OP_GET_USAGE_STATS should be noted, not checked." into pi-dev am: 64bbb2014e
am: 830af174ed

Change-Id: I808449f6122ae54e590d7bc2338ad140a47cca33