Merge "Fix fingerprint onEnumerationResult to use remaining instead of fid" into oc-mr1-dev