Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo