Merged r158465 through r158660 into branch.