Update formatting on API classes, Part 3

Change-Id: I526be68e21836201c992b391a81f4d41e1fa801e