Merge "Update sholes fingerprint to FRG83G" into gingerbread