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

* commit 'ab5cdb2f4d0557fd37092966ccd8cdfb42880561':
  Fixed the layout for the fingerprint renaming