Merged r158229 through r158464 into branch.