Build 10216 of branch trunk