xoom2: updates

Change-Id: Id11151be1b5b227b066abf0b1b9016442a56059c