Merge "Add functionality to restart fp enrollment." into tm-qpr-dev