am 332bdffa: am 09dc0633: Merge changes I74796043,I74796043

* commit '332bdffa4fd2f3c12bd501cdd92c037d337f3cc7':
  logd: Add control statistics enable/disable.
  logd: cleanup