[automerger skipped] Merge "Adding atoms for metrics logging" am: 52e94a65fe -s ours am: c40408ef72 -s ours
am skip reason: Change-Id Ifa57f23135b4cd63888df2b8f25650be133bb1de with SHA-1 5d8df1f08c is in history

Change-Id: Icffebe5ee2c0137cb9c886d2959decb9d87e8fea