am 9b94f839: am ab5cdb2f: am 593fe777: am 22e51c8b: am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev

* commit '9b94f839d63bba8e1144e146d19001c585a29254':
  Fixed the layout for the fingerprint renaming