Merge "Remove StorageManagerServiceTest" am: c118981c am: 76abc0ce am: eb9022e5 am: a2410adf Change-Id: I4879a0a1965768600143751869914183bd630b32