Merge "Fix StorageManager stack use after scope." into pi-dev
am: 5f8939eecd

Change-Id: I32bef5d320a48e3387f4ebb353038c29823ebcc0