am a968f1b1: am 518e6f3e: am f15665a8: Merge "Add StorageManager Test" into gingerbread

* commit 'a968f1b17daf75d859ab9617b8f7d4ec22327655':
  Add StorageManager Test