Merge "logd: disable flaky tests"