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

Change-Id: Ica44b7c1da3fb8daa8c84d95e798a39259bc0549