Merged r157653 through r157895 into branch.