Merge "Update enroll to match mocks" into qt-dev
am: dbe4384909

Change-Id: Id5692eacf7cfcbdbaae484aaf578ef1852fab68f