Merge "Update fingerprint settings to spec" into mnc-dev