Merge "CTS is always separately released for a single API level, hence no need to specify API level" into klp-dev