Merge changes Id93f0efb,I691414d4 into lmp-dev

* changes:
  Fixes run cts --class
  Fixes metrics reporting