Merge "Fix cts test due to API changes." into lmp-dev