Merge "Don't show sizes with sample paths." am: 9b5b23555d
am: 8ad76b0415

Change-Id: Ibe855c6ab20e0d849a5c6af66bc71b1ed42cefe9