Merge "Temporary hack^H^H^H^H workaround to fix CtsVerifier crash." into sc-dev