Merge "Cleaned up getScopedFileLocks() return value"