Merge "DO NOT MERGE: Fix CTS regression" into lmp-dev