smba1002: many changes based on xoom 4.4 tree