Merged r158704 through r158906 into branch.