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

Change-Id: I208b5123fcc8741dd3b07857f516d227306c202c