am 9afe698a: Merge changes Id93f0efb,I691414d4 into lmp-dev

* commit '9afe698a2605aa52b25454fd740848ac2d097bcd':
  Fixes run cts --class
  Fixes metrics reporting