Merge "Update storage wizard's assets." into mnc-dev