Merge "DO NOT MERGE Bump CTS version for L, to avoid confusion with earlier versions" into lmp-dev