Move to u8500-common