Merge "Code reformatting for upcoming automated code changes."