Merge "Fix CTS build." into lmp-dev