Automatic merge from submit-queue Updated unit tests @janetkuo updated the flaky unit test to have the same structure with regard to uncasting as the rest of the tests. ptal