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

* commit '6e512e0815c8678621077008498f18e73402ecc3':
  [Fingerprint] Change message in encryption