Merge "Remove StorageManagerServiceTest" am: c118981c9c

Change-Id: Iba2175b9484ef86b6e482d2e8e98dd23b0b9e033