Merge "add Xoom wifi menu option" into ics