Xoom: round 3! and that should do it!

Change-Id: I9d16eb2042532921ab3d4a93c8389272520c0d9b