Added different flow for re-enrollment
am: bba7632f28

Change-Id: Ie5174848a3a35df197177b0aa2cf6c324813b8dd