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

* commit 'd3a62f1b6e9993d3a4a5f477ae541686e6b57ef4':
  Also consider secondary storage when verifying paths