Merge "Update sholes fingerprint to FRG83D" into froyo