Merge "Adding Step Counter test for CtsVerifier" into lmp-dev