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

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