am 5f2868e9: Merge "Fix CTS build." into lmp-dev

* commit '5f2868e9ebe36212d9297b0abbeee381af48ae06':
  Fix CTS build.