Merge "Modifying CTS for new ECG feature" into lmp-dev