Merge "Update the stroage icon." into mnc-dev