Merge "Fix crash issue on Storage Manager app" am: cb4a3c55cf am: 69be98ae52
am: 5fc179b22d

Change-Id: I13a5780d407f596a7026d36d55130fa98eb0882f