Changes for HTC Chacha (contributed)