Merge "Update sub header string in storage type root"