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

* commit '34163e8259db8661afbb267e3b899b64f429bcb7':
  Give storage provider access to secondary devices.