Merge "Fix storaged memory leak" am: f7970cee69
am: 4c03b47720

Change-Id: Ida0c1fae84cfb8d1b95e6f1dbf20ffa7e5c90242