Merge "ResetListener in StorageManagerService" am: 6b3a5194d9
am: 493110e0b4

Change-Id: I25a0a9a949d17c0a0d05106dc91254f5fbc901e3