am 55d12486: Merge "Give storage provider access to secondary devices." into klp-dev

* commit '55d12486df5e801dc8e74d96abdf87a250bc0ba1':
  Give storage provider access to secondary devices.