Merge "StorageManager: Improve exception handling" am: cf3a4a68bd
am: 545cf37844

Change-Id: I452e3fcbda9cfa24db5b2bfdd077b7e5a7b241b4