Cherry-pick log fix