[automerger skipped] Adding atoms for metrics logging am: f00d7fb3bd -s ours
am skip reason: Change-Id Ic502acc8831fe4da0b32a826171d10e9c0f9876d with SHA-1 167c3db934 is in history

Change-Id: I47e1d1956cb4bc5c7aa693b3cacc61efdcc4d254