Finer-grained synchronization

Change-Id: Ia69d2500c160fc7cacfbf8729d4e717b3676fcf2
2 files changed