[automerger skipped] Adding atoms for metrics logging am: b870481099 am: feae8e51ea -s ours
am skip reason: Change-Id Ic502acc8831fe4da0b32a826171d10e9c0f9876d with SHA-1 61be9f21aa is in history

Change-Id: I39493ac64ca88d768c8b6a8a0540124d0694ce8c
tree: f418a9fe9923d32735a9a7536f5aec3f69ab870a
  1. bin/