am 63cccf0e: am a33b68af: (-s ours) am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '63cccf0ee900cef3c8046cbc1002e29977d370d8':
This commit is contained in: