Merge "Fix storaged memory leak"
am: f7970cee69

Change-Id: Ia51fe075a343d75d12f6bda3d996bf999de5530f