[automerger skipped] Merge "Adding atoms for metrics logging"
am: 52e94a65fe -s ours
am skip reason: change_id Ifa57f23135b4cd63888df2b8f25650be133bb1de with SHA1 5d8df1f08c is in history

Change-Id: Ic592001081265d20d21b954c5e1331b5dcc92985