Merge "Remove ubrk_setText hack."