Merge "[Fingerprint] Change message in encryption" into mnc-dev