am 1f9a9288: Merge "Be more forgiving in parsing verifier IDs" into ics-factoryrom

* commit '1f9a928864be7cfc76c99b8f69706e739e6a7b08':
  Be more forgiving in parsing verifier IDs