Merge "Fix fingerprint for multiuser" into mnc-dev