am 91825062: add check for FileNotFoundException

Merge commit '91825062617f361fdf3687811194195678123391' into gingerbread-plus-aosp

* commit '91825062617f361fdf3687811194195678123391':
  add check for FileNotFoundException