Merge "Update strings for skip fingerprint setup" into oc-mr1-dev