am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev

* commit '36c931b31a15b4ed740c861ec34b7e6573cfd32e':
  Also consider secondary storage when verifying paths