Merge changes I96998c4b,I161bf03b

* changes:
  logd: last iterator initialized incorrectly
  logd: ASAN cleansing