Merge "Fix fingerprint enrollment bug that fails during last leg" into oc-mr1-dev