Test: The code compiles, and most changes are cosmetic. Change-Id: Iae06d7bbbe0212067de4302d4004d89d45812176