Merge "[ABDX fixit] Fix common typo "eligiblity" Test: trivial comment fix"