Merge change 4878 into donut

* changes:
  Add smalltest annotation to HardwareServicePermissionTest.