Fix bug with corresponding entry finder.

(ParserFactory edits are to satisfy format checker)

Bug: b/307512460
Test: npm run test:unit:ci
Change-Id: Ie80ad2152c8caaa19c7caf01d8b080dcc120b40a
4 files changed