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

Change-Id: I7cca8861fb716739c1367d9ae60c720ee660f64b