Merge commit '29f28cdc5315d11919595bf8623d6a67797a34e7' into gingerbread-plus-aosp * commit '29f28cdc5315d11919595bf8623d6a67797a34e7': Change storage names to match 10-13 decision
Merge commit '29f28cdc5315d11919595bf8623d6a67797a34e7' into gingerbread-plus-aosp * commit '29f28cdc5315d11919595bf8623d6a67797a34e7': Change storage names to match 10-13 decision