Changes to use fewer synchronized blocks. Change-Id: I854a5ff9d34be63e46d26f3d78953bc3b8cc796a Former-commit-id: 7adb742310b662763315fc721d6d6f326b8ba160