Merge "logd: test modernization"