Merge commit 'd4610977' into froyo-plus-aosp * commit 'd4610977': framework: Hide StorageManager for froyo - DO NOT MERGE