Merge "Fix CTS tests depending on FileNotFoundException" into klp-dev