Merge "logd: cap out-of-order entry search" into oc-dev