Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev