Merge "Persist fingerprint names" into mnc-dev