Merge "Remove a redundant synchronized block"