Merge commit '825db2da053598d36b5021b3468c7d599ee96a7c' into gingerbread-plus-aosp * commit '825db2da053598d36b5021b3468c7d599ee96a7c': Update storage names to 10-13 decision; add USB erase nugget
Merge commit '825db2da053598d36b5021b3468c7d599ee96a7c' into gingerbread-plus-aosp * commit '825db2da053598d36b5021b3468c7d599ee96a7c': Update storage names to 10-13 decision; add USB erase nugget