am f15665a8: Merge "Add StorageManager Test" into gingerbread

* commit 'f15665a8079a2411cd68358a2d03fff526f72d26':
  Add StorageManager Test