Merge "z71: Updated fingerprint" into gingerbread