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

Change-Id: Iaa7f97df590cbf93e1d5c942dae5f3be55988f11