Merge "Change storage names to match 10-13 decision" into gingerbread