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

* commit '874dfd733a2fd2224f155ee2c4cf5e3065676402':
  Give storage provider access to secondary devices.