Merge "Add support for fingerprint@2.2 and face@1.1"