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

Change-Id: I4902ac96635179494350bb04f6d3bdce529cb505