Merge "Clean up atoms.proto" into pi-dev
am: 9fef2594f3

Change-Id: If643c3ebd8800c1d55d20a21850e9b56e35acfab