am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev

* commit '6132fe1c02a944bf87604a4773e091124de4954d':
  [Fingerprint] Change message in encryption