Merge "Show proper icons for SD and USB attached storage." into nyc-dev am: eef85e0c02
am: f3322fccfa

* commit 'f3322fccfa21ce251055b1051788a5b411c28f26':
  Show proper icons for SD and USB attached storage.