Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev