Merge "logd: best 2/3 filter for timezone glitches"