Merge "Add the functionality for logging counters." am: 7868a0d82f
am: d94b674d58

Change-Id: I7035a5d20bbf6afb35dad2bacd8d416e8c493f8a