am 6a587acd: Merge "Fix fingerprint for multiuser" into mnc-dev

* commit '6a587acd1dcaa0b0d58ff9ac58e8a2ebff0aa3be':
  Fix fingerprint for multiuser