Merge "Encore: update fingerprint" into gingerbread