Reviewed-by: dholmes

Reviewed-by: wetmore

Reviewed-by: darcy, weijun

Summary: Reduce scope of synchronized block
Reviewed-by: weijun