Merge "Add StorageManager Test" into gingerbread