Cherry pick from master with no changes
Test: unit tests, verified atom logging with statsd_testdrive
Bug: 180584913
Change-Id: I0b8db72c0cb3b285177bbe402ce37639c468dbf3
Merged-In: I0b8db72c0cb3b285177bbe402ce37639c468dbf3
(cherry picked from commit a28ccaf373)