Merge changes I74796043,I74796043

* changes:
  logd: Add control statistics enable/disable.
  logd: cleanup