Merge "Remove redundant synchronized blocks"