Merge "Revert "logd: iterator corruption paranoia""