Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev