Merged r156806 through r156977 into branch.