Remove unneeded lock and add smaller scope Change-Id: I03a437057d54ce2d72c07a080bb872693b7f3f6c [ROCm/clr commit: 6e86d29a58]
6e86d29a58