[automerger skipped] Adding atoms for metrics logging am: f291fbc3ef am: 5312a3d3c0 -s ours
am skip reason: Change-Id Ic502acc8831fe4da0b32a826171d10e9c0f9876d with SHA-1 7a4a2f615e is in history

Change-Id: I39493ac64ca88d768c8b6a8a0540124d0694ce8c
tree: 3c6a86940fa8dd0ab254984c302d8db7a3da29de
  1. atom_field_options.proto
  2. atoms.proto