Merge "Fix SubInfo#toString consistency."
am: f15b5b38db

Change-Id: I72c286a53c36c62addfe1e46e3a513742d2adf1b