am a769c2b2: am 2acd43d3: Replace shared storage with USB storage.

Merge commit 'a769c2b2b13bff94cf21deada89f0ededac6a2b2'

* commit 'a769c2b2b13bff94cf21deada89f0ededac6a2b2':
  Replace shared storage with USB storage.