am 22e51c8b: am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev

* commit '22e51c8b4f6622cc160d8652b8abe9db304b9a5a':
  Fixed the layout for the fingerprint renaming