Merge "Remove CtsTestStubs" into lmp-dev