Merge "Fix more post-commit review comments."