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

* commit 'c7e76bfce7ebddc273087cd8808cccdba593e2ee':
  Fix CTS tests depending on FileNotFoundException