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

Change-Id: I6cb3f225714c742e5f2c294babc964f65e2ccc8f