Revert "core: add storage related strings"

This reverts commit fca0c26ba0c0c547a7630405476ea38986db80fd.
Merge remote-tracking branch 'upstream/kitkat' into kitkat