Merge "p999: update fingerprint from OTA" into gingerbread