Merge "Be more forgiving in parsing verifier IDs" into ics-factoryrom