Compact everything to the same sample group size.

Change-Id: Ibb4f3a5d76173d64de916ef1eb41ab5d7900c97b
Merge "Compact everything to the same sample group size."