Merge "[Lock] Distinguish FileNotFound error from all other"