am d23cc4b8: am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread

Merge commit 'd23cc4b814c01675f6503c4dcab21655c56d0256'

* commit 'd23cc4b814c01675f6503c4dcab21655c56d0256':
  Change storage names to match 10-13 decision