This fixes the crash with non-root. If the lock is held by root, non-root sdk crashed checking the lock file.
Merge remote-tracking branch 'upstream/master'