Merge "Froyo-specific startcts Fixes" into froyo