sii9234: merge from 9300u8