Merge "New "sm" shell tool to call StorageManager." into mnc-dev