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

Change-Id: I39493ac64ca88d768c8b6a8a0540124d0694ce8c