Merge "Fix scope of mLock" into oc-dev