Merge "Clean up atoms.proto" into pi-dev