Merge "bug:3402846 fix settings->storage" into honeycomb