am 26cfad45: Replace shared storage with USB storage.

Merge commit '26cfad45869a0258e67f663d8fdf3d822ce62bbf'

* commit '26cfad45869a0258e67f663d8fdf3d822ce62bbf':
  Replace shared storage with USB storage.