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

Change-Id: I2f22baf7b6bf1e48d252af27b592edd496bb1848