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

Change-Id: I6fb19bf76e79696ef60b1c2d2fed845290d8e98e