Merge "Fix crash issue on Storage Manager app"
am: cb4a3c55cf

Change-Id: If33e23972770c50cf83a42d8621d31b15b945524