Reviewed-by: xdono
Summary: Reduced the scope of locking Reviewed-by: vinnie
Reviewed-by: darcy, weijun
Reviewed-by: vinnie, mullan
