Merge "StorageManager: Improve exception handling"
am: cf3a4a68bd

Change-Id: Id421cb483655dab6d379251d983da2bdcafe598d