am edf7bf8d: Merge "Allow custom recovery resource dirs."

* commit 'edf7bf8d832fdd2356cb68519b8e717acde94e5b':
  Allow custom recovery resource dirs.