Merge "Remove unnecessary synchronized block"