Merge "Rename nativeHoldsLock to holdsLock and make it work on current thread"