Merge "Avoid redundant logging UPDATE query."