Merge "Fix duplicate array key of fa_deleted in LocalFile"