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

Change-Id: Iebe58fc9a6dc39d21be58f1adf01c1313594583f