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

* commit '8a0be7cebe6145e8f04fd95d153c25026583ae4a':
  Fix CTS tests depending on FileNotFoundException