Moar u8833 stuff

Change-Id: I5d43cfdd27c7f63b5f5d1ee2cf7b7e521826c4fc