Xoom: round 2 fix groups

Change-Id: I1d3f0a8d0fb1db6e70ed48deeacaf2328c04e4b7