Merge "Add missing break statements in FingerprintManager" into oc-dev