Merge "fingerprint: clean up includes" into oc-dev