Update ucb_openberkeley changes from OPENUCB-152.