Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev