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

* commit '593fe7778cde419f73d3ec331d028bd86a4f442b':
  Fixed the layout for the fingerprint renaming