Update enroll to match mocks

Test: manual
Fixes: 132803438
Change-Id: I99a10e60833a31b71abf8fdbf7e426e9867a1cf5
2 files changed